bitkeeper revision 1.1159.1.421 (419a49d5OpcJouN71xtnac-y_agMGA)

Make multicall queues per cpu.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c
index e10a0aaf9795bbad5502427f4837c0aac1a35621..64ba6738419464a07708ef715275d0788725277d 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -39,6 +39,7 @@
 #include <linux/efi.h>
 #include <linux/init.h>
 #include <linux/edd.h>
+#include <linux/percpu.h>
 #include <video/edid.h>
 #include <asm/e820.h>
 #include <asm/mpspec.h>
@@ -344,8 +345,8 @@ EXPORT_SYMBOL(HYPERVISOR_shared_info);
 unsigned long *phys_to_machine_mapping, *pfn_to_mfn_frame_list;
 EXPORT_SYMBOL(phys_to_machine_mapping);
 
-multicall_entry_t multicall_list[8];
-int nr_multicall_ents = 0;
+DEFINE_PER_CPU(multicall_entry_t, multicall_list[8]);
+DEFINE_PER_CPU(int, nr_multicall_ents);
 
 /* Raw start-of-day parameters from the hypervisor. */
 union xen_start_info_union xen_start_info_union;

diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/multicall.h b/linux-2.6.9-xen-sparse/include/asm-xen/multicall.h
index ca169b57b90b6a07be8ad31f0816e456a5a04bbb..1f03675df0631164e6fe2baee641d18d03746d1d 100644 (file)
--- a/linux-2.6.9-xen-sparse/include/asm-xen/multicall.h
+++ b/linux-2.6.9-xen-sparse/include/asm-xen/multicall.h
@@ -30,78 +30,86 @@
 
 #include <asm-xen/hypervisor.h>
 
-extern multicall_entry_t multicall_list[];
-extern int nr_multicall_ents;
+DECLARE_PER_CPU(multicall_entry_t, multicall_list[]);
+DECLARE_PER_CPU(int, nr_multicall_ents);
 
 static inline void queue_multicall0(unsigned long op)
 {
-    int i = nr_multicall_ents;
-    multicall_list[i].op      = op;
-    nr_multicall_ents = i+1;
+    int cpu = smp_processor_id();
+    int i = per_cpu(nr_multicall_ents, cpu);
+    per_cpu(multicall_list[i], cpu).op      = op;
+    per_cpu(nr_multicall_ents, cpu) = i+1;
 }
 
 static inline void queue_multicall1(unsigned long op, unsigned long arg1)
 {
-    int i = nr_multicall_ents;
-    multicall_list[i].op      = op;
-    multicall_list[i].args[0] = arg1;
-    nr_multicall_ents = i+1;
+    int cpu = smp_processor_id();
+    int i = per_cpu(nr_multicall_ents, cpu);
+    per_cpu(multicall_list[i], cpu).op      = op;
+    per_cpu(multicall_list[i], cpu).args[0] = arg1;
+    per_cpu(nr_multicall_ents, cpu) = i+1;
 }
 
 static inline void queue_multicall2(
     unsigned long op, unsigned long arg1, unsigned long arg2)
 {
-    int i = nr_multicall_ents;
-    multicall_list[i].op      = op;
-    multicall_list[i].args[0] = arg1;
-    multicall_list[i].args[1] = arg2;
-    nr_multicall_ents = i+1;
+    int cpu = smp_processor_id();
+    int i = per_cpu(nr_multicall_ents, cpu);
+    per_cpu(multicall_list[i], cpu).op      = op;
+    per_cpu(multicall_list[i], cpu).args[0] = arg1;
+    per_cpu(multicall_list[i], cpu).args[1] = arg2;
+    per_cpu(nr_multicall_ents, cpu) = i+1;
 }
 
 static inline void queue_multicall3(
     unsigned long op, unsigned long arg1, unsigned long arg2,
     unsigned long arg3)
 {
-    int i = nr_multicall_ents;
-    multicall_list[i].op      = op;
-    multicall_list[i].args[0] = arg1;
-    multicall_list[i].args[1] = arg2;
-    multicall_list[i].args[2] = arg3;
-    nr_multicall_ents = i+1;
+    int cpu = smp_processor_id();
+    int i = per_cpu(nr_multicall_ents, cpu);
+    per_cpu(multicall_list[i], cpu).op      = op;
+    per_cpu(multicall_list[i], cpu).args[0] = arg1;
+    per_cpu(multicall_list[i], cpu).args[1] = arg2;
+    per_cpu(multicall_list[i], cpu).args[2] = arg3;
+    per_cpu(nr_multicall_ents, cpu) = i+1;
 }
 
 static inline void queue_multicall4(
     unsigned long op, unsigned long arg1, unsigned long arg2,
     unsigned long arg3, unsigned long arg4)
 {
-    int i = nr_multicall_ents;
-    multicall_list[i].op      = op;
-    multicall_list[i].args[0] = arg1;
-    multicall_list[i].args[1] = arg2;
-    multicall_list[i].args[2] = arg3;
-    multicall_list[i].args[3] = arg4;
-    nr_multicall_ents = i+1;
+    int cpu = smp_processor_id();
+    int i = per_cpu(nr_multicall_ents, cpu);
+    per_cpu(multicall_list[i], cpu).op      = op;
+    per_cpu(multicall_list[i], cpu).args[0] = arg1;
+    per_cpu(multicall_list[i], cpu).args[1] = arg2;
+    per_cpu(multicall_list[i], cpu).args[2] = arg3;
+    per_cpu(multicall_list[i], cpu).args[3] = arg4;
+    per_cpu(nr_multicall_ents, cpu) = i+1;
 }
 
 static inline void queue_multicall5(
     unsigned long op, unsigned long arg1, unsigned long arg2,
     unsigned long arg3, unsigned long arg4, unsigned long arg5)
 {
-    int i = nr_multicall_ents;
-    multicall_list[i].op      = op;
-    multicall_list[i].args[0] = arg1;
-    multicall_list[i].args[1] = arg2;
-    multicall_list[i].args[2] = arg3;
-    multicall_list[i].args[3] = arg4;
-    multicall_list[i].args[4] = arg5;
-    nr_multicall_ents = i+1;
+    int cpu = smp_processor_id();
+    int i = per_cpu(nr_multicall_ents, cpu);
+    per_cpu(multicall_list[i], cpu).op      = op;
+    per_cpu(multicall_list[i], cpu).args[0] = arg1;
+    per_cpu(multicall_list[i], cpu).args[1] = arg2;
+    per_cpu(multicall_list[i], cpu).args[2] = arg3;
+    per_cpu(multicall_list[i], cpu).args[3] = arg4;
+    per_cpu(multicall_list[i], cpu).args[4] = arg5;
+    per_cpu(nr_multicall_ents, cpu) = i+1;
 }
 
 static inline void execute_multicall_list(void)
 {
-    if ( unlikely(nr_multicall_ents == 0) ) return;
-    (void)HYPERVISOR_multicall(multicall_list, nr_multicall_ents);
-    nr_multicall_ents = 0;
+    int cpu = smp_processor_id();
+    if ( unlikely(per_cpu(nr_multicall_ents, cpu) == 0) ) return;
+    (void)HYPERVISOR_multicall(&per_cpu(multicall_list[0], cpu),
+                              per_cpu(nr_multicall_ents, cpu));
+    per_cpu(nr_multicall_ents, cpu) = 0;
 }
 
 #endif /* __MULTICALL_H__ */